Skip to content

fix(files): resolve drop conflicts in folders with other files - #66862

Open
pringelmann wants to merge 1 commit into
masterfrom
fix/files-drop-conflict-resolution
Open

pringelmann wants to merge 1 commit into
masterfrom
fix/files-drop-conflict-resolution

Conversation

@pringelmann

@pringelmann pringelmann commented Nov 20, 2026 •

Copy link
Copy Markdown
Contributor

Summary

Regression from #61291: dropping a local file onto a folder with a same-named file shows no conflict dialog if the folder has other files too, and the upload is silently dropped. When the dialog does show, "Keep both" overwrites the existing file.

The @nextcloud/dialogs picker expects only the conflicting nodes and leaves renaming to the caller. resolveConflict now does both.

How to test

Dialog missing:

  1. Folder with a.txt and b.txt
  2. Drop a local a.txt onto it
  3. Before: "Upload cancelled", no dialog. After: conflict dialog

"Keep both" overwrites:

  1. Folder with only a.txt
  2. Drop a local a.txt onto it, pick "Keep both"
  3. Before: a.txt is overwritten. After: a.txt and a (1).txt

Checklist

AI (if applicable)

  • The content of this PR was partly or fully generated using AI

Assisted-by: ClaudeCode:claude-opus-5-5

Signed-off-by: Peter Ringelmann <peter.ringelmann@nextcloud.com>
@pringelmann pringelmann added this to the Nextcloud 36 milestone Nov 20, 2026
@pringelmann pringelmann self-assigned this Nov 20, 2026
@pringelmann
pringelmann marked this pull request as ready for review November 20, 2026 13:48
@pringelmann
pringelmann requested review from a team and skjnldsv as code owners November 20, 2026 13:48
@pringelmann
pringelmann requested review from kristian-zendato and susnux and removed request for a team November 20, 2026 13:48
@pringelmann pringelmann added the 3. to review Waiting for reviews label Nov 20, 2026
@pringelmann
pringelmann requested a review from artonge November 20, 2026 16:01

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants